Merge "Merge "Introduce HapticFeedbackConstants.TEXT_HANDLE_MOVE" into oc-dr1-dev am: 280acdb88b" into oc-dr1-dev-plus-aosp