Merge "Call service method instead of duplicate code" into main am: 5d7d6299...

Merge "Call service method instead of duplicate code" into main am: 5d7d6299 am: 9226ac6b am: 60117999

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



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