Merge "CtsVerifier test for CompanionDeviceManager APIs" into oc-dev