[automerger skipped] Merge "Integrating new Avatar Picker App in Settings"...

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

am skip reason: Merged-In I8905841cc46ba62099f44dbecf01c06869677bf5 with SHA-1 9d5f70c8 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3051762



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