Merge "Refactor usages of getAliasName to use getAlias in Settings" am: eed0f8816b
am: 4f85f36e7d

Change-Id: I726b2cd3025d2bee79320b420af570ee30eb3700