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

Merge "Merge "Always bring desktop tasks to front" into tm-qpr-dev am: 705dfd7c" into tm-qpr-dev-plus-aosp am: dc449647

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



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