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

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



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