Merge "Add ICompanionDeviceManager.getAssociation overload with explicit userId" into oc-dev
am: 0ac8fd7adb

Change-Id: Icb3fa2e51547fc50cc161052ca83050b5539a1f9