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 udc-dev am: 2b78f004 am: 1a1bdc7a am: 0f3e148d

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



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