[automerger skipped] Use cpu_number to index mapping am: 432f6c00 -s ours am: 163b4e01 -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: I4c2e9f4c599ef870b227f5718e80b4efea3efc61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>