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