Merge "Defer destroying surface while exit animation is running for shell."...

Merge "Defer destroying surface while exit animation is running for shell." into tm-dev am: 0f77c42f

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17070424

Change-Id: Id00b2058da7c2a127fa4fa619cb00342c517e50c