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

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

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