Merge "Make AccountManagerServiceTest work again" into nyc-dev
am: 518bae5

* commit '518bae5fa411327b14ca1e1496f6c9836da0eccd':
  Make AccountManagerServiceTest work again

Change-Id: I162a0022c6f532d2b14dabc71ed891a3e5132d3e