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: aa695145 am: b3e715c8

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

Change-Id: I54cc6b9d97f7b2a5879eda55d37d102d22ed787b