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

Change-Id: I1ae7bb4715c9bffb7c6b2d57da17862f7c25ad55