Fix AccountManagerServiceTest am: d954357860 am: 658b8e7e4b
am: eac40d9949

Change-Id: I27b4175f949e5416943a2a3782b772ce65b846e6