Merge "Change exit animation to use normal z-order. am: a562fe4a23 am: f1963fe340" into nyc-mr2-dev-plus-aosp
am: 3624504854

Change-Id: I430d633d25e0e7d0d50d1794e48026f543f5a378