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

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

Change-Id: If14ea1a8070b8c34ca337067080961fa7da68f02