Merge "Fixed an issue where the media would reappear animated" into rvc-dev...

Merge "Fixed an  issue where the media would reappear animated" into rvc-dev am: 93920d3b am: 6455510f am: 1eeb5d79

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

Change-Id: I7909b749aa619520e0ca19bbfb5295a2b832ce21