Merge "Clean up postWindowRemoveStartingWindowCleanUp" into udc-dev am: 050f26ee5e am: a5bfdebd1b

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

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