Merge "Prevent loading of Icon resources from the wrong package" into tm-dev am: e1e8b1b9

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



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