Merge "Merge "Block relayout during transition to desktop" into udc-dev am:...

Merge "Merge "Block relayout during transition to desktop" into udc-dev am: 3be325fb am: 7f86641c" into udc-d1-dev-plus-aosp am: 4d2f4f63 am: da16b354

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



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