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

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

Change-Id: Iadab83c5c53a46f411ad5d1f12cbbc09cf3d4b2d