Second pass on consolidating usage of AccountManager

Bug: 31776692

Test: run unit tests
Change-Id: I1c3804e33d8e66bb970afd32e63568368cdfb72b
2 files changed