Merge "Merge "Fix potential NPE in CompanionDeviceDiscoveryService" into sc-dev am: 682aa90930 am: fe53de4820" into sc-v2-dev-plus-aosp
This commit is contained in:
committed by
Android (Google) Code Review
commit
ff47a5ab98