Merge "Merge "Fix potential NPE in CompanionDeviceDiscoveryService" into...

Merge "Merge "Fix potential NPE in CompanionDeviceDiscoveryService" into sc-dev am: 682aa909 am: fe53de48" into sc-v2-dev-plus-aosp am: ff47a5ab

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

Change-Id: I9bca927ed83f32d148042a2cd3ef5653e530c5d3