Merge "Hfp: maintain Headset state in mCurrentState" into rvc-dev am: 26c185f002

Change-Id: I05bad1228dfb38a067acb7cb0e406f9a050ac784