Merge "Revert "Revert "Revert "Revert^2 "Audio policy: anonymize Bluetooth MAC ...""" into main