Merge "Disallow loading icon from content URI to PipMenu" into udc-dev am: 4020882d1a am: f2f21be9f8

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

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