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

[automerger skipped] Merge "Audio policy: anonymize Bluetooth MAC addresses" into sc-dev am: 42f0ceab -s ours am: 024be3f4 -s ours am: 37cff376 -s ours am: 61b55639 -s ours am: 744bff1b -s ours am: bb85c3e3 -s ours am: 3e229728 -s ours am: 25017b34 -s ours am: 19ed6edd -s ours

am skip reason: Merged-In Ia6bac184f5f39ed9d538f762ebb89bcceb44ae50 with SHA-1 056d865f is already in history

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



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