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

Change-Id: Iea21e186795daa65b59a25fc22e25c7b5bc215a7