Merge "Hfp: maintain Headset state in mCurrentState" am: 19e0cb8453

Change-Id: I1ed1f209c791b7005479cd8a0f6ef73bbdee71ea