Merge "[Trackpad] Fix not being able to quick switch to the current task" into...

Merge "[Trackpad] Fix not being able to quick switch to the current task" into udc-dev am: fda666fe

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



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