[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: 31c23536 -s ours am: f592153a -s ours

am skip reason: contains skip directive

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



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