Merge "Core changes to support desktop mode option" into tm-qpr-dev am: 86b968c0

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



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