[automerger skipped] Merge "AudioService: anonymize Bluetooth MAC addresses"...

[automerger skipped] Merge "AudioService: anonymize Bluetooth MAC addresses" into udc-qpr-dev am: c30d7d09 am: 150e0f1a -s ours

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

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



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