Merge "Revert "Remove abstract from AccessibilityService methods""