Merge "Fix AccessibilityManager returning duplicate services" into oc-dev
am: 3bf7c7634a

Change-Id: If13ea24cf2d10a197d513029728f1135bb3be537