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

Change-Id: I47e94625405ac15611ce76919dfd0f5f0ca07951