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

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

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