Merge "Rename FingerprintGestureCallback.onGesture" into oc-dev am: cfbe105e4b
am: c8885742db

Change-Id: I651bb7f6a3909b357cc07c015dbe21f5623b7809