Merge "Merge "Prevent pinned stack from having extra elevation" into nyc-dev am: 0f01857 am: d3e36b6" into nyc-mr1-dev-plus-aosp
am: 54108fa

* commit '54108fa5954fd0764f691b0818eb7d560fb955af':

Change-Id: I202d9e64bb8e21cffbc653b15ce9ceca8e9917d8