Merge "Revert of revert: Motion - tweak split shade expansion on lockscreen with media." into tm-dev am: 2549c0f8c2 am: 92ec79cdc1

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

Change-Id: I0586ff074da5671b52a9ee8f34f4f0486bfcb0c0