[automerger skipped] Merge "Adding avatar picker to install on all platform...

[automerger skipped] Merge "Adding avatar picker to install on all platform phones and tablets" into main am: 27abc3ab am: 107cd3ac -s ours

am skip reason: Merged-In Idb550019b13d47e7f0dc389030d508db7d1057f3 with SHA-1 551acb19 is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/3052002



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