[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: 96140fe5 -s ours am: 65791351 -s ours

am skip reason: contains skip directive

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



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