Merge "Merge "Fixed an issue where the media would reappear animated" into...

Merge "Merge "Fixed an  issue where the media would reappear animated" into rvc-dev am: 93920d3b am: 6455510f am: 1eeb5d79" into rvc-qpr-dev-plus-aosp am: 790d3cfe

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

Change-Id: I3e70e4d4cc8a6df9bc870e3f49dc70b6e532718f