Fix AccountManagerServiceTest am: d954357860
am: 658b8e7e4b

Change-Id: I01919f31b0bc67ac543f62f030f290d7bddeb9d5