Merge "Use local mSensors as index of mSensors list" into sc-v2-dev am: 7a6890fe am: 0ab95817

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

Change-Id: I7fcc6f75371de82355572c05f8f3f53376dbf762