Merge "Use cpu_number to index mapping" am: 528a67f89f am: ecd45d3dc2 am: 936dc69889 am: aa491db31a am: 00e2961eb9 am: 7b412e255d

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2579573

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