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

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



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