[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 sc-dev am: 93183190 am: 5d55535a am: a659525a -s ours am: 7abe1254 -s ours am: 371ade11 -s ours am: e57148ad -s ours am: f0e6288e -s ours am: 7ff50f97 -s ours

am skip reason: Merged-In Ic8cb75ed586e94c5895065f772bfb21013396dd0 with SHA-1 e73bb60f is already in history

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



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