Merge "Fix AccessibilityManagerServiceTest" into rvc-dev