Merge "Merge "Fix double-tap detection in TextView's SelectionModifierCursorController" into rvc-dev am: 2d4921d1f5 am: fc434c9308" into rvc-d1-dev-plus-aosp