Merge "Use localized strings for HD Audio option label" into oc-mr1-dev am: ced95e7f38
am: 9b918e8340

Change-Id: Ia822dd306b2d4633e1414b84a434b7d001f10077