Merge "[automerger skipped] Merge "Disallow loading icon from content URI to...

Merge "[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into sc-dev am: 1f2e080f am: 0fbf93b9 am: 31262f43 -s ours am: 9c653875 -s ours am: aa0362b1 -s ours am: a83ed731 -s ours am: d10ccc37 -s ours am: 728219a5 -s ours" into udc-d1-dev-plus-aosp am: e2be62ca -s ours

am skip reason: Merged-In Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e with SHA-1 1aee6560 is already in history

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



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