Merge "Revert "Clean up index assignments and comparators"" into tm-qpr-dev...

Merge "Revert "Clean up index assignments and comparators"" into tm-qpr-dev am: 7ec075c5 am: a8dd816a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19483426



Change-Id: I3a052e68a253cfea8e168d2928d3c1a825c05ab6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>