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: 0b3a2fa9 am: 397466d2

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



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