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

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



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