Merge "Decreasing notifications height on split shade lockscreen" into sc-v2-dev am: 2958d2d2

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

Change-Id: Ic07a52fa70d3d85604a98e3e5ae3d892b6b29913