Merge "Correctly send the original address in BluetoothPhoneService if using gateway" into lmp-dev