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

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



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