[automerger skipped] [DO NOT MERGE][conflict] Merge "Disallow loading icon...

[automerger skipped] [DO NOT MERGE][conflict] Merge "Disallow loading icon from content URI to PipMenu" into rvc-dev am: 5d31bd1c am: 8451e9a0 -s ours am: 5bc9e928 -s ours am: fa10d780 -s ours am: 08dd2ef7 -s ours am: 7d2065df -s ours

am skip reason: subject contains skip directive

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



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