[automerger skipped] Merge "Add MessagesFilterTest and MessagesListingTest"...

[automerger skipped] Merge "Add MessagesFilterTest and MessagesListingTest" into tm-qpr-dev am: ec6c22be -s ours

am skip reason: Merged-In I2bc7c32c72e9eb71b40b245204de243d6a5c3395 with SHA-1 0aa7c110 is already in history

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



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