Merge "AAudioService: integrated with audioserver" into oc-dev am: d9534fb352
am: 9e4f285724

Change-Id: I127c84ff4c9e2fad40804fccd82f5eb341af3b10