[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ddf629a3fd -s ours am: d218e10bf0 -s ours am: 0af89c307c -s ours am: b54f6807f0 -s ours am: 85ca454790 -s ours am: d70197cdfb -s ours am: f4cae855e3 -s ours

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

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

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