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

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

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

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



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