Merge "Preventing from double remove starting window after Activity destoryed"...

Merge "Preventing from double remove starting window after Activity destoryed" into udc-dev am: b9df9a61 am: 31089898

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



Change-Id: I95411472c5c04cc58719892d2c788a5c4ac0f09b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>