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

[automerger skipped] Merge "Verify that the caller has permissions for the icons it provided." into tm-dev am: c16a34e1 am: 521022e0 -s ours am: 1744dc9a -s ours am: 2120690e -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: I6a49b29bebd8c17d4ced4eba477fbe08556ca95e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>