Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
am: 1c414bf30b  -s ours

Change-Id: Ia3cabe5460e2f9f2a532e9f038f80909e8176d9b