Merge "Fix potential NPE in CompanionDeviceDiscoveryService" into sc-dev am: 682aa90930 am: fe53de4820
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15223919 Change-Id: I23e0b9f0940acf8206457f36a92c2f78b1a945cb
This commit is contained in: