[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: ddf629a3fd -s ours am: d218e10bf0 -s ours am: 0af89c307c -s ours am: b7b3df4949 -s ours am: 4984eb4806 -s ours am: 794ac554ce -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: Ia96c509e7bfabd42ee36a769f6458ae074b86e89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>