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

Change-Id: I281b3885016f830df5d221a3ffb94a3d26e4f222