Merge "Merge "Change contents animations" into nyc-dev am: 2bb3dd8632 am: dd5eea667f" into nyc-mr1-dev-plus-aosp