[automerger skipped] Merge "Adding avatar picker to platform allow list" into main am: 487165c647 am: 8cb9033ee7 -s ours

am skip reason: Merged-In I096d28bce5f879f88f185f09014d139f0497cb72 with SHA-1 f1d32bc12d is already in history

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

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