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

Change-Id: I4530101db853d033babf03318cabbfe5bfc8d2e7