Merge "Remove use of @hide getConnectionService in the HfpClient code."