Merge "Update Qualcomm(R) aptX(TM) strings" into oc-dr1-dev
am: 8d7cd4bcaa

Change-Id: Id89bc7a8e7b64675ce269201d7afd2e0fca9040d