Merge "Fix not being able to collapse notification shade using the trackpad"...

Merge "Fix not being able to collapse notification shade using the trackpad" into udc-dev am: b04fd885 am: 8d7e1e2e

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



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