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

Change-Id: I1558ff443ffc28a21e80f5752feb535e08152f07