Merge "Unbind AccountManagerService from authenticator." into udc-dev