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

Change-Id: I629400d7bc766b8a806dca5b3b44e6bb7d922bfc