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

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

Change-Id: Id3b6faa7dc6a4682f28d478a25ba6f337e9d4a22