Merge "Make AudioService perm provider HDS aware" into main