Merge "Merge "Change exit animation to use normal z-order." into cw-f-dev am: 6abcefd350 am: 522372ad23" into nyc-mr2-dev-plus-aosp
am: 77cd18c069

Change-Id: Iea95ac28760341cc388f45b2a25066cfbb6632e4