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

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



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