[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 63cc804e52 -s ours

am skip reason: Merged-In Ibb06757cd67d3107e3a7ec96ecda8dbe82bfcc66 with SHA-1 502b2c5c22 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/AvatarPicker/+/27908570

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