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

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

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