Merge "Remove redundant twiddling of Settings.Secure.ACCESSIBILITY_ENABLED" into nyc-dev