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

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

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