Merge "Use transition for desktop-mode switch when enabled" into tm-qpr-dev am: d6c6f5865f am: ddf207959e

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

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