[automerger skipped] AudioService: anonymize Bluetooth MAC addresses am: 787a07d969 -s ours am: 0e17ca6913 -s ours am: 585d6b8b6f -s ours am: 446621b4b1 -s ours am: a85a29c3a6 -s ours am: 859ca70530 -s ours am: e4aa645afd -s ours

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

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

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