Merge remote-tracking branch 'aosp/upstream-main' into main am: be20d35221

Original change: https://android-review.googlesource.com/c/platform/external/pandora/avatar/+/2761088

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