[automerger skipped] Merge "Map: Check AdapterService before stop" into...

[automerger skipped] Merge "Map: Check AdapterService before stop" into tm-qpr-dev am: bd87b220 am: 74dba276 -s ours

am skip reason: Merged-In Idcc45516b8ad1ad0a2b47f9171a7192bf013cdd4 with SHA-1 f8684416 is already in history

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



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