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

Change-Id: Idfc54941a233d2b37cc4585d0064b8d86a74d465