Merge "Motion: tweak split shade expansion on lockscreen with media." into...

Merge "Motion: tweak split shade expansion on lockscreen with media." into tm-dev am: aea2342d am: 01b7e898

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

Change-Id: I3dc86e379a0b798983ac867c97cfdd21cff280d2