Merge "Adds carrier config to determine if high definition audio is displayed" am: 26e5096364 am: fc125a319e
am: 57c781417f  -s ours

Change-Id: Ic021a41d713aaa4f8a4af6cdcc1560b7b718b6e8