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

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

Change-Id: Ice83d48b372edb3a962a10c7fe780cecb69d49a1