Merge "Remove unnecessary functions from AssistGestureFeatureProvider" into oc-dr1-dev