Merge "On lockscreen to quick-settings transition, media-player should fade in...

Merge "On lockscreen to quick-settings transition, media-player should fade in to quick settings instead of just appear." into tm-qpr-dev am: cb1af1ca am: 05b13683

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



Change-Id: Ie291a4bb3f60c83ff251a60047fbca7486179d4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>