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