[automerger skipped] Merge "[RESTRICT AUTOMERGE] Check permission of Autofill icon URIs" into tm-dev am: 3011f5dd87 am: 5d478d7ca5 -s ours

am skip reason: Merged-In I48879174664b70ced90492bb0991dc91cbf89b79 with SHA-1 0698b8fe72 is already in history

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

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