Merge "IAE: Service not registered: com.android.server.AccessibilityManagerService" into honeycomb