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

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



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