Merge "Merge "Prevent pinned stack from having extra elevation" into nyc-dev am: 0f01857 am: 6e6a6ee" into nyc-mr1-dev-plus-aosp
am: c2be3ea

* commit 'c2be3ea7cdf0e4ae3f64bec94e937a53bd975094':
  Prevent pinned stack from having extra elevation

Change-Id: I33675b67b7d84eb23ffdec6c9a8e21cd19f3064c