Merge "Displaying HD audio indicator for GSM/CDMA calls"
am: 7242c13d05

Change-Id: I96b5a1b86d8cb6d7b089c283ce34273116ad8fea