Separate the account name from the account manager's account name

b/10894178

Change-Id: I0dc80452bc5e01de0a5e2e69ab2b2189a3c88909
6 files changed