Merge "Connect battery service only when it's available" am: 1f68930c am:...

Merge "Connect battery service only when it's available" am: 1f68930c am: 4c880681 am: 323c93ca am: 6aacee05

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



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