[automerger skipped] Merge "Resolve NPE and unexpected error code in AccountManagerServiceTest" am: 6078bc1602 am: 47ea1e53f3
am: 220c0a434a  -s ours

Change-Id: Idc4558dbc4ad56570ea9769c96ae0842f0fa9f84