Merge "Fix an issue where stack education and the stack weren't aligned" into...

Merge "Fix an issue where stack education and the stack weren't aligned" into tm-dev am: 4db1adb6 am: 14a8e9a3

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

Change-Id: I4cc4955e88ca27b6200ff7a32b4d1c0622687bcf