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

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

Change-Id: Ifb1f67cff49ad353acedea52d9bce008091cedb8