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: 3321008b am: 6960a2ed am: a884f9e6

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



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