Merge "Fixing scrims jumping when media player state changes" into tm-qpr-dev...

Merge "Fixing scrims jumping when media player state changes" into tm-qpr-dev am: 19304644 am: 06aff3d2

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



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