Merge "Add CarrierConfig to displaying HD audio indicator for GSM/CDMA calls" am: 0be23629a8 am: c9cfb504f7
am: 114adea744

Change-Id: I606353211d342fd87c92103b4277129454a4ceea