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

[automerger skipped] Merge "RESTRICT AUTOMERGE - Revert "Audio policy: anonymize Bluetooth MAC addresses"" into sc-qpr1-dev am: e18ee06a -s ours am: a37eb2de -s ours am: dbc5295e -s ours am: a82e5024 -s ours am: bf13f14e -s ours am: b990da24 -s ours am: 88ef511c -s ours

am skip reason: contains skip directive

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



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