[conflict] Merge "Verify that the caller has permissions for the icons it...

[conflict] Merge "Verify that the caller has permissions for the icons it provided." into tm-dev am: c16a34e1 am: 5a866ff0

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



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