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

Change-Id: Ife96eb768668fe4597e81c8655174aa9748e57cd