Merge "Fix media jumping horizontally on lockscreen when expanding...

Merge "Fix media jumping horizontally on lockscreen when expanding split-shade" into tm-qpr-dev am: 662ed672 am: cdc83509

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



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