Merge "Add gestures unit tests to inputflinger test mapping." am: 1884da1051 am: fc887bb056

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2312066

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