Merge "Merge "Add usage of app:behavior_skipCollapsed" into nyc-dev am: 514e08249a am: 06b7ca35c3" into nyc-mr1-dev-plus-aosp
am: c604102450

* commit 'c604102450def4bdfafcc1faeb0c35952edd0210':

Change-Id: Ic85850babe6d8b4536deb1318f8600a6ea99b0ff