Merge "Reset fingers and buttons in GestureConverter::reset" into udc-dev am:...

Merge "Reset fingers and buttons in GestureConverter::reset" into udc-dev am: c4ddd876 am: 5abcceaf

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



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