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

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

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

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



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