[automerger skipped] Merge "Integrating new Avatar Picker App in Settings" into main am: cb9cd3fa46 am: 469cc72050 -s ours

am skip reason: Merged-In Ie5831cec9ebb7a8d5cfabc93300ca2d6cadb944b with SHA-1 e6c9a08ab7 is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/3051323

Change-Id: I84c79e86231b5bd8142b5ad81d52f6b90ebf2da2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Anna Bauza
2024-04-23 12:35:13 +00:00
committed by Automerger Merge Worker

Diff Content Not Available