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

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



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