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

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

Change-Id: I7b5f9338820f6691b41e874479c0ac6bc065e1a3