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

Change-Id: I791daac12e5e3e4a7435f412bbf2c22ba62e3463