Merge "MAP: Dismiss permission dialog on service stop" into main am:...

Merge "MAP: Dismiss permission dialog on service stop" into main am: 7f103a3b am: 50f30ee5 am: 87ea50a4 am: aaab8195

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



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