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

Change-Id: Ib7224916b21c8c502a8fa370559e69da565e751d