Fix EXTRA_DEVICE data returned from CompanionDeviceActivity

Add actual device data to the Intent passed to setResult() in
CompanionDeviceActivity with EXTRA_DEVICE key.

Bug: 211471810
Test: atest CtsCompanionDeviceManagerUiAutomationTestCases
Change-Id: I560321291a51cef67ca7cb0ed18ba97a64dae579
1 file changed