Merge "btif: hf: minor refractory of connection state emission" am: 2baf98e3 am: fa8568dc

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



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