Merge "HFP: Fix clearAdapterService call in unit tests"