Merge "Do not check for battery service when seeing if any profiles are...

Merge "Do not check for battery service when seeing if any profiles are enabled" am: aa29109a am: e7373487 am: e13e0dc4 am: 5f884ca2

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



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