Merge "Resolve NPE and unexpected error code in AccountManagerServiceTest"
am: 6078bc1602

Change-Id: I5e9046068f71be3afc18587ae6afa46ff03f12d7