Merge "Update HfpClientConnectionService package name"