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

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



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