Merge "Merge "Bump special windows layer adjustment" into oc-mr1-dev am:...
Merge "Merge "Bump special windows layer adjustment" into oc-mr1-dev am: f3f7a101" into oc-mr1-dev-plus-aosp
am: f3956afd
Change-Id: Ia935f34470f34f7ec723fd318cf7a6cbfcbb096c