Merge remote-tracking branch 'aosp/upstream-master' into rebase_xnnpack am: 1b64d9d304 am: 782bdb7c29 am: 66e5f4ceed

Original change: https://android-review.googlesource.com/c/platform/external/cpuinfo/+/2203158

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