Fix for CompositeCursorAdapter returning wrong item view types

Cherrypick of
https://googleplex-android-review.googlesource.com/#/c/306995/,

which fixes the bug that causes getItemViewType to be called
with the wrong position, causing new views to be created
unnecessarily.

Bug: 8398321
Change-Id: I6c921fe7d5135cf9f9d9bdd08b5aa4df7662ac1c