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

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



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