Merge "Clean up postWindowRemoveStartingWindowCleanUp" into udc-dev am: 050f26ee5e am: 2a5ccc71d6 am: 7c56d98058 am: 615655b075

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

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