Merge "Revert^2 "[Media] Update background gradient scrim to use album theme colors."" into tm-dev am: 3c7d69d9 am: 7925bc6a am: 4ad295eb

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



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