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 am: 21625ab3

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



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