[automerger skipped] Merge "Add MnsObexServerTest" into tm-qpr-dev am:...

[automerger skipped] Merge "Add MnsObexServerTest" into tm-qpr-dev am: b373fcb7 -s ours am: 5553da42 -s ours

am skip reason: Merged-In Ib73845a9ec30cb424d359892cb055a58f5d7355e with SHA-1 1e1e125d is already in history

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



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