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

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

Change-Id: I3a32f89dd1d85dc45d4e44d02ebf85121bddd6e2