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

Change-Id: Iee4e6c542d2bb30556e48df4797e6492e229cb63