Merge "Hfp: maintain Headset state in mCurrentState"