Merge "Suppress layout handling during animateOut()" into nyc-support-25.2-dev
am: 06ce76214e

Change-Id: I48ae8cc44a6854542d483f382dd1209187575e83