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

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

Change-Id: I4d3b8ece97fbcf5a61bc80c3a8085706e04c3d5b