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

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

Change-Id: I4705e225ed0e4b412deaf89baded43705f0cc4f9