Merge "Support l11n of Qualcomm aptX strings" into oc-mr1-dev
am: b1bd840924

Change-Id: Ibc7eed03b814ae725c9a86bca16be6c3f5c70141