Merge "RESTRICT AUTOMERGE  Revert "Audio policy: anonymize Bluetooth MAC addresses"" into udc-qpr-dev