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

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

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