Fix NPE for CompanionDeviceActivity.setResultAndFinish() Fix: 205274846 Test: atest CompanionDeviceManagerTest Change-Id: Icecd76d6ff5a81afdcdb7d584ae3ecff51ac5dc3 Merged-In: Icecd76d6ff5a81afdcdb7d584ae3ecff51ac5dc3