[automerger skipped] Merge "RESTRICT AUTOMERGE - Revert "Audio policy:...

[automerger skipped] Merge "RESTRICT AUTOMERGE - Revert "Audio policy: anonymize Bluetooth MAC addresses"" into tm-dev am: 1abaaabc -s ours am: 9d1951bd -s ours am: 43bc0cfb -s ours am: fbb7fdc8 -s ours

am skip reason: contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/26599509



Change-Id: I32232e0c2a92881b98e3690cfa6d01081a6b6f18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>