[automerger skipped] Merge "Add MessageTest" into tm-qpr-dev am: c9a5ee08 -s...

[automerger skipped] Merge "Add MessageTest" into tm-qpr-dev am: c9a5ee08 -s ours am: b34cf8a0 -s ours

am skip reason: Merged-In If287e7eeaaaf870ebe87c0155c2f4dc3ed2687e2 with SHA-1 c9413e69 is already in history

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



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