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

Change-Id: I42060d76f3dd12b8fe3fc3275762fbc22ace89c8