Merge "DO NOT MERGE - Update localized Qualcomm(R) aptX(TM) strings" into oc-dr1-dev