Merge "Ensure stackHeight accounts for pulseHeight and dozeAmount where we used to use innerHeight." into sc-dev am: 6645cb8a am: af026d32

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

Change-Id: Id758d502d90720900c3e67b78a7abdb56bdccda7