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

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



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