[automerger skipped] [DO NOT MERGE][conflict] Merge "Disallow loading icon from content URI to PipMenu" into rvc-dev am: 5d31bd1c3b am: 8451e9a0c7 -s ours am: 5bc9e9288e -s ours am: fa10d780de -s ours am: 08dd2ef76b -s ours am: 7d2065df8a -s ours am: 5904480a8a -s ours am: d47040b736 -s ours am: 5fb26cd6bc -s ours am: 7c153dac7f -s ours am: e016e7787c -s ours am: 6c8bef3f00 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24228701
Change-Id: Ic49cc73deefd35529f39e9d5ee7b31634a6927b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>