Merge "Fix the media launch animation on lockscreen" into sc-dev am:...

Merge "Fix the media launch animation on lockscreen" into sc-dev am: f0b85630 am: f3431784 am: 547d416b

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

Change-Id: I423e7e3f8fa5b2950c340675ea3f8f69302bbf81