[automerger skipped] Merge "Use cpu_number to index mapping" into udc-dev am:...

[automerger skipped] Merge "Use cpu_number to index mapping" into udc-dev am: b67329d7 -s ours am: cb6ec99b -s ours am: 649bddc8 -s ours

am skip reason: Merged-In Id17661c50bda4cd4aecee6c7658e97c718dd4ec4 with SHA-1 bbd443fd is already in history

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



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