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