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

Change-Id: Ie8c5318db7dfb4dfa4009e9cb34ccc618bcc8077