Merge "Update the method name from isHfpDevice() to isConnectedHfpDevice()"