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

Change-Id: I39e0644a56a747f4b570b643016cacdc6e250dfc