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

[automerger skipped] Merge "[conflict] Merge "Verify that the caller has permissions for the icons it provided." into tm-dev am: c16a34e1 am: 5a866ff0" into tm-qpr-dev am: e97f2a9c -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: I7c810f77e599a166bc5bc4580b97d114e2b32433
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>