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: 3047485e am: ecf7a0af am: b4280bef

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



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