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: cd620baa am: 3b29e4b9

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



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