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

Change-Id: If24afc1a316da64fbf49ad08ee761e5af7dde4b7