Merge "Applying cleanup to default AIDL AudioControl" into sc-dev