Merge "Merge "Fix unexpected starting window removal timeout when in...

Merge "Merge "Fix unexpected starting window removal timeout when in fixed-rotation" into udc-dev am: 228c3d30" into udc-dev-plus-aosp am: 8bba4bf5 am: b99a98a6 am: 24820710

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



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