Address CDM API feedback

Fixes: 181175212
Test: atest CompanionDeviceManagerTest
Change-Id: I33c5b2ddaedd09a9f4fae29b247f42e2351b1a0f
3 files changed