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

Merge "Block relayout during transition to desktop" into udc-dev am: 3be325fb am: 272ea373 am: 86e1a47e am: 898dd1c2

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



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