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

[automerger skipped] Merge "RESTRICT AUTOMERGE - Revert "AudioService: anonymize Bluetooth MAC addresses"" into udc-dev am: f0636ae1 -s ours am: 390ce128 -s ours

am skip reason: contains skip directive

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



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