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

Change-Id: If829c47b72444f722cd64abfb6e333c7ed394feb