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: 21037051 am: c6d49fa4

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

Change-Id: Id3d1a1f2d08cfc35574631bafe8d455422e3ff1a