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

[automerger skipped] Merge "Audio policy: anonymize Bluetooth MAC addresses" into sc-qpr1-dev am: a02afb1d -s ours am: 4da2b168 -s ours am: 6d659f77 -s ours am: 38c062cf -s ours

am skip reason: Merged-In Ia6bac184f5f39ed9d538f762ebb89bcceb44ae50 with SHA-1 7583cf24 is already in history

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



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