Merge "Simplify logic for connect in HfpClientProfile" am: 57d9052ce8
am: 6b245cdff6

Change-Id: I698880342edde2c6834f8487850cdc580fd8e735