Merge "Merge "Fix enterAlways|enterAlwaysCollapsed with window insets" into nyc-dev am: 3df4cf603e am: cfaa8c243a" into nyc-mr1-dev-plus-aosp
am: 08b1322e8c

* commit '08b1322e8c51028728f0a6517ec2003a00e9d248':

Change-Id: I445060e93313f82b5ae3872e5d7547f4d7649ffb