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

[automerger skipped] Merge "RESTRICT AUTOMERGE - Revert "Audio policy: anonymize Bluetooth MAC addresses"" into sc-v2-dev am: 376c7df3 -s ours am: b9c6c2e9 -s ours am: 356d2464 -s ours am: 01238e7a -s ours am: 1b38cc82 -s ours

am skip reason: contains skip directive

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



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