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 am: e7b90c10

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

Change-Id: Ic271d582147b7a361eaeac5dc3f88f8a1bd74d61