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

[automerger skipped] Merge "Audio policy: anonymize Bluetooth MAC addresses" into tm-dev am: c92c5167 am: a8b9eab4 -s ours am: aa9a7496 -s ours

am skip reason: Merged-In Ia6bac184f5f39ed9d538f762ebb89bcceb44ae50 with SHA-1 0f5b5f32 is already in history

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



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