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

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

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