[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into tm-dev am: b986ddc460 am: 8ffe0b3304 -s ours am: 638e85c8bf -s ours am: ca699ccf76 -s ours

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

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

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