Merge "Fixed an  issue where the media would reappear animated" into rvc-dev am: 93920d3b am: c3eaaa9b am: 47c54391

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

Change-Id: Id1adfa64cff18098109d1206b48c888e6d14dac2