Merge "Block relayout during transition to desktop" into udc-dev am: 3be325fb64 am: 7f86641c7e

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

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