Merge "Merge "Disallow loading icon from content URI to PipMenu" into udc-dev am: 4020882d am: 83feb9b9" into udc-d1-dev-plus-aosp am: 1eeebe79

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



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