Merge "Fix potential NPE in CompanionDeviceDiscoveryService" into sc-dev am: 682aa90930 am: 7fedf9af99

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15223919

Change-Id: I473742d283bf1ccd81bf0924012c6a94428da0cf

packages/CompanionDeviceManager/src/com/android/companiondevicemanager/CompanionDeviceDiscoveryService.java

@@ -317,6 +317,9 @@ public class CompanionDeviceDiscoveryService extends Service {
     }
 
     void onDeviceSelected(String callingPackage, String deviceAddress) {
+        if (callingPackage == null || deviceAddress == null) {
+            return;
+        }
         mServiceCallback.complete(new Association(
                 getUserId(), deviceAddress, callingPackage, mRequest.getDeviceProfile(), false,
                 System.currentTimeMillis()));