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

Change-Id: I259218d16a0c368c7374d2ac5d2e7dfc3d2d14e2