Merge "Fix starting window stuck because of the remove status." into udc-qpr-dev am: 580b02902a am: 41cb486be7

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

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