Merge "Revert of revert: Motion - tweak split shade expansion on lockscreen...

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

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

Change-Id: I73b3817c6c3372c2935c210de03ae7c616e2e7e5