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

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

Change-Id: I4c67d68500f22473df038437f17dbaf34cbabdd7