Merge "Adds new HapticFeedbackConstants for Android UDC."