Merge "Disallow loading icon from content URI to PipMenu" into tm-dev am: b986ddc460 am: 59ad018804

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

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