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

am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history. Merged-In was found from reverted change.

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

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

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