Merge "Clean up postWindowRemoveStartingWindowCleanUp" into udc-dev am: 050f26ee5e am: 858c15eba4 am: 5e03b7502a am: a90e086ce0

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

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