Merge "audioserver: enable AAudioService for MR1" into oc-mr1-dev
am: c1982130b3

Change-Id: Ibeb8a74a8b12b36c0898fc98c3d4bd2857632252