Merge "Revert "Motion: tweak split shade expansion on lockscreen with media."" into tm-dev am: 03879bfc am: c536bf01

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

Change-Id: I8ffed3b264687e6120ef67ac101206316849e92d