Merge "Scrim now scales with the album image" into tm-qpr-dev am: f0e063d1 am: dab136db

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



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