Merge "Fix crash when loading album art by resource" into tm-qpr-dev am: 531b63c1 am: ce0c4343

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



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