Merge "Make AccessibilityService#disableSelf atomic." into nyc-dev