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

Change-Id: Ie605dd35d09400b4bd14994ec145ed055b5c3d7a