[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu"...

[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into sc-dev am: 1f2e080f am: 0fbf93b9 am: 31262f43 -s ours am: 9c653875 -s ours am: 27fa09dc -s ours am: ed04c8f6 -s ours am: 4754284f -s ours

am skip reason: Merged-In Ib3f5b8b6b9ce644fdf1173548d9078e4d969ae2e with SHA-1 1aee6560 is already in history

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



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