Merge "Merge "Displaying HD audio indicator for GSM/CDMA calls" am: 62bd6006e9 am: 68bd6ae440 am: 1c57d9c53a"