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

Change-Id: Icb70620c2bc7e84fb19196c26d8c576220eefe13