Merge "Use cpu_number to index mapping" into udc-dev am: b67329d7

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



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