Merge "Remove "result2" in AccountManagerService" am: eaf4d18bdf am: 4b4b759272
am: 640a087f91

Change-Id: I89f76114c37fe63556c0813cb860ba01366c98c9