[automerger skipped] Merge "Add tests for BluetoothMapMasInstance and BluetoothMapObexServer" into tm-qpr-dev am: 06092fa3 am: 2f275625 -s ours

am skip reason: Merged-In I11a049cc3ac35f05f58917dd5c592100f75d4300 with SHA-1 3732878c is already in history

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



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