Merge "Always bring desktop tasks to front" into tm-qpr-dev am: 705dfd7c5e

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

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