Merge "Support l11n of Qualcomm aptX strings" into oc-mr1-dev am: b1bd840924
am: 62a96b2ed5

Change-Id: I390876729aaace8639a3d78effa975707d75eba1