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

[automerger skipped] Merge "Disallow loading icon from content URI to PipMenu" into tm-dev am: b986ddc4 am: 59ad0188 am: 3ed142fe -s ours am: f000df9f -s ours am: fdfcec45 -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/+/23436487



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