Merge UBSan crash fix from upstream am: 972ec0c816 am: 06546f299b

Original change: https://android-review.googlesource.com/c/platform/external/libchrome-gestures/+/2855729

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