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

Change-Id: I986cf5d08147dc3dd72b9ff009b391a852a4d121