Merge "Cleanup unused methods deleted from IBluetoothHearingAid.aidl"