[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: 05abf2ce0a -s ours am: 90b514ec38 -s ours am: 4e8c2f4410 -s ours am: 8cab8146f9 -s ours am: 706c85ca3c -s ours am: 670bca2da3 -s ours am: fb87cb8af4 -s ours

am skip reason: Merged-In I67bbba2ba941c97138a068d640079b17650e3d86 with SHA-1 ddf629a3fd is already in history

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

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