Merge "AccessibilityServiceInfoTest#testAccessibilityServiceInfoForEnabledService failing." into jb-mr2-dev