Merge "Fix unexpected starting window removal timeout when in fixed-rotation"...

Merge "Fix unexpected starting window removal timeout when in fixed-rotation" into udc-dev am: 228c3d30 am: 25dcac5e am: b9529205 am: a5b0a99a

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



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