Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev