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

[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into tm-dev am: b986ddc4 am: 8ffe0b33 -s ours am: 638e85c8 -s ours am: f1b2a588 -s ours am: 80f9805d -s ours

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

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



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