Merge "Move check for 'desktop mode active' to helper" into tm-qpr-dev am: 0de70a41

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



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