Merge "Exclude scrim padding when calculating stack height on lockscreen" into...

Merge "Exclude scrim padding when calculating stack height on lockscreen" into sc-dev am: bb793e1b

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

Change-Id: Idac933e2a4514ef6b7b704e66f29ca4b49a5dad0