[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: 5509f1e1 -s ours am: 909c0e36 -s ours

am skip reason: contains skip directive

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



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