Merge "Revert "Make CompanionDeviceManager.getAllAssociations() public""