Merge "Do not reset battery level when HFP is disconnected" am: 8784b063

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



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