[automerger skipped] [conflict] Merge "Verify that the caller has permissions...

[automerger skipped] [conflict] Merge "Verify that the caller has permissions for the icons it provided." into tm-dev am: c16a34e1 am: 5a866ff0 am: 49aec9e6 -s ours am: 7718effb -s ours am: faa39223 -s ours am: 4ebf7511 -s ours

am skip reason: Merged-In I08992550507572a4878c501184360a58adef53ad with SHA-1 bad47a22 is already in history

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



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