Merge "Add AudioPolicyServiceLocal interface" into main