Merge "Fix Battery info not shown after BT off/on" am: c13952d3 am: 470be344 am: 49b2c2f3

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



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