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

Change-Id: I0ea2dba4f84c5be97b72b7724cf0243e994f692b