Merge "Fixed an  issue where the media would reappear animated" into rvc-dev am: 93920d3b10 am: 6455510f71 am: aa695145b6

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

Change-Id: I4d5af3a5d3fb76e48f782e7b555f9e4bd0b867a7