Merge "Verify that the caller has permissions for the icons it provided." into...

Merge "Verify that the caller has permissions for the icons it provided." into sc-dev am: 93183190

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



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