Clean up usage of Account.name when accessing account/folder prefs

b/11185963

Change-Id: Ifbf18db787a94c8f6b9cf6e890322c87f5d5dded
6 files changed