[automerger skipped] Merge "Add FilterInfoTest and tests for...

[automerger skipped] Merge "Add FilterInfoTest and tests for BluetoothMapContent" into tm-qpr-dev am: 23bef9ea am: 7951c6de -s ours

am skip reason: Merged-In I1c386633eed4c0190652f65fdfcc678b2512a760 with SHA-1 9711ad86 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Bluetooth/+/20692236



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