Merge "Use correct stack height when bypass enabled." into sc-dev am:...

Merge "Use correct stack height when bypass enabled." into sc-dev am: 44cd9995 am: 71588f71 am: 8c1976c0

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

Change-Id: I621eb11c5991a2e79c52e0aae0283bd2c6ab9ad3