Merge "Updates method names according to API review in BluetoothHapClient"