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

[automerger skipped] Merge "Audio policy: anonymize Bluetooth MAC addresses" into sc-v2-dev am: 9b9d3fdd -s ours am: 10591e97 -s ours am: 0dff07e4 -s ours

am skip reason: Merged-In Ia6bac184f5f39ed9d538f762ebb89bcceb44ae50 with SHA-1 8682ced7 is already in history

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



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