Merge "Refactor dependency on AccessibilityManager." into udc-dev