Merge "Adds carrier config to determine if high definition audio is displayed" into nyc-mr2-dev
am: e6d5a19e5f

Change-Id: Ifb5c7df88ad6191dfbfeda29b9b5fed97a32e530