[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 skip reason: subject contains skip directive

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



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