Merge "Resolve NPE and unexpected error code in AccountManagerServiceTest"