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

[automerger skipped] Merge "Audio policy: anonymize Bluetooth MAC addresses" into udc-qpr-dev am: 0a963310 am: 4cabd03d -s ours

am skip reason: Merged-In Ia6bac184f5f39ed9d538f762ebb89bcceb44ae50 with SHA-1 24df283a is already in history

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



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