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: I42f483e027754e52a7a516a8fa9912d663f39713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>