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 am: 25dcac5e am: 3cc11b3f" into udc-qpr-dev-plus-aosp am: 3fed5d2f

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



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