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

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

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