Merge "Fix NullPointerException in GestureDetector" am: 534f3a94aa am: ab048ad534

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

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